From 53bda392cef5a8234e4895730f40484725d3bc3c Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Sun, 19 Oct 2025 02:03:48 +0200 Subject: [PATCH] ripgrep: bump to 15.0.0 release notes: https://github.com/BurntSushi/ripgrep/releases/tag/15.0.0 patch dropped - integrated upstream. Signed-off-by: Paul Donald --- utils/ripgrep/Makefile | 4 +-- utils/ripgrep/patches/010-fix-riscv64.patch | 34 --------------------- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 utils/ripgrep/patches/010-fix-riscv64.patch diff --git a/utils/ripgrep/Makefile b/utils/ripgrep/Makefile index 58c102cc70..f57a6d1fda 100644 --- a/utils/ripgrep/Makefile +++ b/utils/ripgrep/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ripgrep -PKG_VERSION:=14.1.1 +PKG_VERSION:=15.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/BurntSushi/ripgrep/tar.gz/$(PKG_VERSION)? -PKG_HASH:=4dad02a2f9c8c3c8d89434e47337aa654cb0e2aa50e806589132f186bf5c2b66 +PKG_HASH:=e6b2d35ff79c3327edc0c92a29dc4bb74e82d8ee4b8156fb98e767678716be7a PKG_MAINTAINER:=Luca Barbato PKG_LICENSE:=MIT Unlicense diff --git a/utils/ripgrep/patches/010-fix-riscv64.patch b/utils/ripgrep/patches/010-fix-riscv64.patch deleted file mode 100644 index dc70b0a184..0000000000 --- a/utils/ripgrep/patches/010-fix-riscv64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3c70b9a4900aab74c7643007e2b8127f9d016ed7 Mon Sep 17 00:00:00 2001 -From: Aleksey Vasilenko -Date: Thu, 12 Sep 2024 17:08:36 +0300 -Subject: [PATCH] switch to tikv-jemallocator - ---- - Cargo.toml | 4 ++-- - crates/core/main.rs | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -59,8 +59,8 @@ serde_json = "1.0.23" - termcolor = "1.1.0" - textwrap = { version = "0.16.0", default-features = false } - --[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator] --version = "0.5.0" -+[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.tikv-jemallocator] -+version = "0.6.0" - - [dev-dependencies] - serde = "1.0.77" ---- a/crates/core/main.rs -+++ b/crates/core/main.rs -@@ -37,7 +37,7 @@ mod search; - // i686. - #[cfg(all(target_env = "musl", target_pointer_width = "64"))] - #[global_allocator] --static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; -+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; - - /// Then, as it was, then again it will be. - fn main() -> ExitCode { -- 2.30.2